merge
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Tue, 15 Aug 2006 14:51:47 +0000 (15:51 +0100)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Tue, 15 Aug 2006 14:51:47 +0000 (15:51 +0100)

Trivial merge